From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Mon, 25 Sep 2017 18:39:12 +0000 (+0000)
Subject: Merge "resourceloader: Remove deprecated MessageBlobStore::insertMessageBlob"
X-Git-Tag: 1.31.0-rc.0~1967
X-Git-Url: http://git.cyclocoop.org/%22.%24info%5B?a=commitdiff_plain;h=aadb5ffcb0d8a6df267358ede7e5d6b1d3f675e6;hp=757be5fe14b92aacd75ef70aa80824ee1379f8d8;p=lhc%2Fweb%2Fwiklou.git

Merge "resourceloader: Remove deprecated MessageBlobStore::insertMessageBlob"
---

diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index bbaaf16b61..60a49b7652 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -39,7 +39,7 @@ changes to languages because of Phabricator reports.
 * …
 
 === Other changes in 1.31 ===
-* …
+* MessageBlobStore::insertMessageBlob() (deprecated in 1.27) was removed.
 
 == Compatibility ==
 MediaWiki 1.31 requires PHP 5.5.9 or later. There is experimental support for
diff --git a/includes/cache/MessageBlobStore.php b/includes/cache/MessageBlobStore.php
index b076a083c9..b262eab602 100644
--- a/includes/cache/MessageBlobStore.php
+++ b/includes/cache/MessageBlobStore.php
@@ -128,14 +128,6 @@ class MessageBlobStore implements LoggerAwareInterface {
 		return $this->getBlobs( $modules, $lang );
 	}
 
-	/**
-	 * @deprecated since 1.27 Obsolete. Used to populate a cache table in the database.
-	 * @return bool
-	 */
-	public function insertMessageBlob( $name, ResourceLoaderModule $module, $lang ) {
-		return false;
-	}
-
 	/**
 	 * @since 1.27
 	 * @param ResourceLoaderModule $module
diff --git a/tests/phpunit/includes/OutputPageTest.php b/tests/phpunit/includes/OutputPageTest.php
index 52103f97cc..d29c79de84 100644
--- a/tests/phpunit/includes/OutputPageTest.php
+++ b/tests/phpunit/includes/OutputPageTest.php
@@ -685,10 +685,6 @@ class NullMessageBlobStore extends MessageBlobStore {
 		return [];
 	}
 
-	public function insertMessageBlob( $name, ResourceLoaderModule $module, $lang ) {
-		return false;
-	}
-
 	public function updateModule( $name, ResourceLoaderModule $module, $lang ) {
 	}